Fix outlook bugs