Sideloading and img linking improvements