Fix a couple tiny bugs.