And some other small changes