Some mminor fixes that were sitting in my mailbox. Major fixes will have to wait until I get more time available :(
