Various

If you want me to skip any patches so that you can merge the PR let me know.