Misc minor update