Minor build cleanup