Minor Fixes

Things (especially features) get lost sometimes. I found them, and put
them back where they belong.