minor fixes, brought in changes in main from master