Several fixes in custom pitch.