Syntax setting tweaks and fixes