- Fixing some build errors