Fix for error messages, and for not having SUBM field