Feature fix code warnings

Some minor fixes to eliminate php warnings.