Build tweaks

In case you find these useful.