Fixed up some stuff so it should be working for 0.9.1