Warning checks

adjusting code to remove warnings