A few more build changes