fixes for SPP