Fix a few hacks.