More minor fixes, 95.9 percent overall