Fixed a few more pawn bugs