Fork for fixes

unknown revision 'd5175878aa0e'