Update: minor fixes