some font-lock fixes