Project changes to allow successful Ad Hoc build