Minor buildsystem tweaks

Play nicer with OS X ;).