Fixes to support PHP strict standards