Conservation of energy fixes