Updates to fix linker issues