Resolved a bunch of error messages