Xmap: fixed some warnings