Small fixes for pelemeles