+ FIXMES. Clean up source links