minor FF bugs fixes