Several minor, but annoying bug fixes.