Fixed lexicons problems

Fixes #53