Fpage minor changes