Minor fixes

Just a couple things that I've been patching myself... Would be nice to get them into the package.