Changes to support 10.6 SDK, tweaks for demo changes