Fix couple of places that generate errors/notices