-Fix some build issues, and checkin the latest Simulation output