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

I found some more PHP 5.5 changes needed while working on the 2.0 Combat fixes.

Some of these where not fun to fix, and hopefully through my limited testing no more regressions occur.  I tested all of them the best I could to ensure they function as they should.

Signed-off-by: jdarwood007