Fix a couple minor bugs that have not been hit (yet)