Fix a couple of things that were causing me problems on my local
install.