fix things from last merge