Various minor updates and tweaks