Small fixes to Baselli