fixes for zcc lexer