Spatial fixes
Merge pull request #328 from sibartlett/spatial

Spatial fixes