minor fixes again