Fixed FEnvironment and FEntity