last fixes for Pitch (pushed after Pitch)