Some final fixes from my machine
Merge branch 'laptop' into my-rpi