Bug fix release 11.04.06

Fixes a few bugs that slipped through the net.

Posted by tohc1 2011-04-06