Small fixes (3)