bug fixes for xtm.xtm