Repair warning display and remove minor cruft