More stability fixes

Added a couple of fixes to prevent cases that would cause the game to soft-lock

Water is now visible on the wooden floor in the inn tilesets.