Fixed compilation module
Fixed tokeniser