Fixes to websockets for production