Fixed the warnings issues in other places.