Fixes for the spatial simulation