Warning Free

Minor modifications to remove warnings