Minor fixes

merge this