doctrine/inflector and couple of fixes