fixes to last 2 commits