Fixing Build Breakage