Made the main codebase compile