cs fixes to chaplin boilerplate