Applied Joanie's GTK fix and fixed camera issue.