Misc minor improvements and updates