Bug fixes in the SSE handler