Fixed move and scaling problems