Fix last glitches