[WIP] some tweaks ahead of symfony live ny 2014