Fix issues with latest fg