Fixed linker errors with the new extern changes