Some other minor updates