Fixing animation and map jumps.