Fixed up some project settings and code.