Corrections for PHP5.4 compliance + new demo models