XXX more fixes