A handful of cleanups and minor bug fixes