Fix specs for recent content & data changes