Small fixes (6)