Minor build cleanup stuff