fixing a couple issues flagged by dart editor 1.4.2

Raymond, if possible, please take a look and let me know if these look right.