Made the engine build, removed linker warnings