Fix some bugs in GC-FM