Tidy up error notifications/terms