More propel2 fixes