Fix remaining reds/yellows.