Photography bugs update