Update: fix minor issues