Fix minor issues found from testing