Fixed physical issues in the simulator