tiny changes to make this all compile and test in 2013