Small fixes and clearer event/error messages