minor fixes to pass phpci builds