fixing up refactoring breakages - bad james!