Add/update missing bits in order to support MVC5.2.