More code review changes
Build for simulator by default