Small fixes

Tested on Linux & Sparky