various fixes for xap97net