Developing: fix link bugs