Modifs to comply with SensioLabs Validator