more fixes for cell gfi