Fix some lingering bugs.