- more fixes, to let spatial compile