Eliminated most warnings