More fixes for php notices