Bring back camerawrapper && Fix building camerawrapper