Build fixes

Fix some issues with the recent lexer work.