spatial_form minor changes