Fixes to pass SensioLab Insights analysis