More PHP 5.5 fixes found while working on 2.0 PHP 5.5 Combat

Signed-off-by: jdarwood007 <github2@sleepycode.com>