Corrections for PHP 5.4 + new demo models