Eliminated further warnings