Some fixes for the ASpMvc fork