Couple of fixes for the terrain generator