Tried to fix the link errors