fixed tiny stuff broken by last merge