Cleanup some type issue.