Merge "Fix error formatting issues"