Fix ActivitySerializer
Merge pull request #1503 from markewallace/BugFixes

Bug fixes