Fix FF support, update for new gain syntax