MMAPS: HomeMovement fixes