Sp. fixes