SPINOZA fixes