Various import and scope changes