Eliminated simple warnings