Some flux integrator fixes and current gain adjustment