Various fixes to groove extraction