Other patches GFC

Up