More corrections to get codeception to run in different php environments