mods for latest changes for spring-yarn-thrift