Fix review comments from Standard8