fix some fixtures problems