Changes from rake update_source and rake update_style