Rid of Sorroko, fixes