Fix some problems in f2 step