Small fixes (4)