Fixes and updated error messages