Few improvements to php mode