FF bugs and cleanup