Add several img fixes