xii fixes (mostly pushing for jessica)