Cleaned up all warnings