Fixed issues reported in singleplayer causing errors.