Update various minor changes