Fix link errors