Fork for fixes

unknown revision 'ea55b4906146'