Fixed up some project configuration problems

Change-Id: Ie56b1f516053667bebcfb6d7b48ce05234c6cc3f