Camera and torch fix