Fixed linker issues