Fix some build errors.