More ff2 Fixes