Some fixes to compile properly since this version has change a lot from 0.6.1