AxHost change and other minor fixes