ViewModel protection and serializer fixes