Bug fixes to various things

Having trouble keeping up with version control now that I have to fix
bugs all over the place.