Server Movement Fixes