A few minor updates and fixes