#716 - Missing import statements. Fixing build.