Tidied up some build configurations.