Misc minor updates