Fix some issues with ASP.net's view state
Not sure why this wasn't committed previously