Bug fixes in move