Fixes for mixed and complete data.