fixed linker issues