Fix bugs introduced with new canonical and streams
2.0.5