Fix up fixtures