Small fixes (5)