Fix strict errors for php > 5.4