fuji-common: moar changes