Additional updates to enable FirstDemo2.Mac to work