Some other small changes