Update for 1.5.3 compatibility

Updated core files with 1.5.3 updates