Fixes for SensioLabInisght #5