Cleaned up some warings