Some fixes

plz merge