Razor issues: enum completion and etc
Fighting to support Razor after refactoring
Various fixes