Fix coasting issues