Fix compilation errors (still linker errors)