Miscellaneous updates and tweaks