Variation building & invalidations fixes