Tweaks

See commit log