Fixed Link Bugs

Thanks again to Rui Zhuang <jokyzhuang@gmail.com> for finding them.