Some patches for sxiv