Few minor fix ups to the new code highlighter integration