Fixes in SPL program