Misc fixes

Clean up as I use the library.