[XAPID-1037] fix some minor bugs
2 files changed