more changes to deal with php error-reporting of warnings