fix issues found in a live implementation