minor fixes
auto merge