Few fixes that people asked me

This should make @djs55 and @matthieujournault happy