Fixes for razor template