Some other minor changes