Fixed some things based on SensioLabs Insight run against experimental.