main: minor fixes