fuji-common: several changes