Better error messages and fix methods & stream parameters