Some minor tweaks to make my build on Linux a little easier