Ooops, small fixups