Fix rare case errors from user reports