Fix issues of @grant none.