A few minor updates and tweaks