Polish on labeling and error messages