These are some fixes picked up as I was working on greater refactoring, submitted to clear the plate a little.