Fixed SensioLabs issues (mostly minors)