Resolved linker errors