Misc

See commit messages
Comment is out-of-date