Fix some fixtures