Comment SP: fixes