Fixes for bugs reported by people on the Basilisk forums