Fixes for Camera, Audio and DT2W