couple of quick fixes
merge