Bug fixes

- fix build busters caused by bad merge
- fix animation server bug, not sending entire billboard