Fix serializers for AMS 0.7.