More PHP warning error bug fixes