Fix some build details