More tweaks

See git log.