Random things (please see attached commit messages)