Fix clean; minor error message fixes