Three more problems and style changes.