Some fixes for pelemele