Adds a couple more edge cases for link types. kind of annoying