Tweak some minor issues so it works on linux