Fix some fixture stuff