fixed a few build errors, many remaining
Merge branch 'feature/separate-serializer' of github.com:d60/Cirqus into feature/separate-serializer