some SP fixes