Eliminated 2 warnings