Fixes for FF