Fix compile a bit, still WIP