resolved compilation issues after merge - namual rename of fn-> filename, file -> filename etc