Fixed couple of warnings