Couple of fixes and error messages support