Fixing entry point to use the logical filename and removing context
Fixing some build problems