Minor fixes to avoid PHP warnings.