FF related fixes