Rich Soil and Rich Farmland Bugfixes