A few more minor updates