Fixing warnings
Minor edits