eylonb Small fixes