Updates to helpers and error messages