fixes based on symfony insights