Fixed motion bugs