Fixing some tiny bugs that I found.