Minor edits in imports