a few more tweaks for php warnings