Misc. Bug Fixes

An assortment of minor bug fixes.