Fixes for SPL spec