Fix Gallery issues with camera also