Various fixes here and there. Nothing to see here.