fixes for syntax highlight issues