Fixes and improved error reporting