SPP-related bug fixes