Added some fixes for f1 and f6 nodes