Conformed files to 4.5 update