maguro raw-el fixes