Fixed couple of warnings
Fixed couple of warnings