first wave of compatibility with older PHP fixes