fix issues found in QA
update to latest TopShelf