Fixed all warnings
Fixed all warnings