Fixes for what was pushed on 0.9f

Patches from Team Wasteland for 0.9f bugs.