more clementine commits to fix gst 1.0 bugs