A few fixes, to be squashed