Updates in preparation of Exe compile