Misc minor updates/cleanup