Minore changes to build infrastructure.