Missing data bug fixes