Fix code highlight issues