Updates to comply with PHP Strict recomendations