Mac Port related (with Chameleon) changes

RT