Small fixes (es)