Fixing FP opts and branch bubble