Small fixes (2)