Adding fixes for web sockets / canon / boost issues