Misc

See commit message...

Merging