Clean up warnings from dartanalyzer