Fix API endpoint & image clone issues