server-side moves - batch of fixes