Fix to linker errors