Fix a few more refactor issues