Fixed issue with Joanie's patch and fixed camera interface.