post-refactoring mac fixes