Linker fixes to allow compilation, still completely unworking though