Eliminated analyzer warnings