- Terrain fixes

Fixes to make terrain work