XXX small fixes