Misc

See commit messages
Nope :)