Build issue and fix branches