import fixes and fileOps fixes