Fix some issues in Razor project
fixes