More Flo optimizations (Credits to Vanir)