Minor changes to core files