Fixes to work with actual MUDs