Small fixes, random link api