Small tweaks to doctrine package