Fix link bug and others