Add minor fixes on Doctrine and Propel plugins