A few minor updates to things