Appied recommended fixes