add fixes for PHP stricts