Applyed recommended fixes