Thanks to Bill Lam for a patch for the 1.7 stuff. Will circle around later tonight to test this on the RPi.