Fixes to get SciPy2014 demo working